[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 7480bd0b62 -s ours am skip reason: subject contains skip directive Change-Id: I3b95392088a97bbc0e94edbd8acef763cdb09261